From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 27 Aug 2002 20:37:00 +0000 (+0000)
Subject: (find-alternate-file): Bind kill-buffer-query-functions locally, don't set it.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~30988
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9d68b46c61250efb8fc80e9440dcee183abe50f6;p=emacs.git

(find-alternate-file): Bind kill-buffer-query-functions locally, don't set it.
---

diff --git a/lisp/files.el b/lisp/files.el
index abba36a5c07..2d129c888e5 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -964,9 +964,10 @@ If the current buffer now contains an empty file that you just visited
 	(lock-buffer)
 	(rename-buffer oname)))
     (unless (eq (current-buffer) obuf)
-      ;; We already asked; don't ask again.
-      (setq kill-buffer-query-functions nil)
-      (kill-buffer obuf))))
+      (with-current-buffer obuf
+	;; We already asked; don't ask again.
+	(let ((kill-buffer-query-functions))
+	  (kill-buffer obuf))))))
 
 (defun create-file-buffer (filename)
   "Create a suitably named buffer for visiting FILENAME, and return it.